Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 21:57:00 +0000 (21:57 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 17 Jan 2010 21:57:00 +0000 (21:57 +0000)
commit14c80086497b1330d92d3fb6e5cdbeb7b905b2b3
tree780755274ee6de17d78899b765ec4f9cda3169b3
parent32d4b4c67ac199ef88223168e3ad97ed91e4efde
parent4cd87c0618fe8ce470099d314b515a1547f175e9
Merge from mainline.